{non-gerrit}/qt-labs/widgets-ng.git/tests/auto/qhttpsocketengine, branch master

Merge commit 'qt/master'

2009-08-13T08:27:51+00:00

Conflicts:
	examples/opengl/samplebuffers/glwidget.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/gui/gui.pro
	tests/auto/qhttp/tst_qhttp.cpp
	tests/auto/qkeyevent/tst_qkeyevent.cpp

Update contact URL in license headers.

2009-08-12T03:21:45+00:00

Reviewed-by: Trust Me

Unified QtNetworkSettings:severIP return type for all platforms.

2009-08-11T06:06:36+00:00

This commit fixes the following autotest case build breaks on
windows when compiling QtS60 sources:
    - q3socket
    - q3socketdevice
    - qhostinfo
    - qsocks5socketengine

Trailing whitespace and tab/space fixes for auto tests

2009-08-04T11:30:41+00:00

Merge commit 'qt/master-stable' into 4.6-merged

2009-06-30T09:21:56+00:00

Conflicts:
	.gitignore
	configure.exe
	src/corelib/concurrent/qtconcurrentthreadengine.h
	src/corelib/global/qnamespace.h
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qwidget.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontdatabase.cpp
	src/network/access/qnetworkaccesshttpbackend.cpp
	tests/auto/network-settings.h
	tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
	tests/auto/qvariant/tst_qvariant.cpp

Update license headers as requested by the marketing department.

2009-06-16T12:08:09+00:00

Reviewed-by: Trust Me

Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

2009-05-20T11:44:05+00:00

Conflicts:
	tests/auto/network-settings.h
	tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
	tests/auto/qiodevice/tst_qiodevice.cpp
	tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
	tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
	tests/auto/qsslsocket/tst_qsslsocket.cpp

Adpot more code to use QtNetworkSettings instead of hard coded names.

2009-05-19T13:11:39+00:00

Reviewed-By: Peter Hartmann

network autotests: do not use imap.troll.no for testing

2009-05-19T11:40:42+00:00

... but use the test server instead

Reviewed-by: Frans Englich

Long live Qt for S60!

2009-04-24T11:34:15+00:00